From 2c84e4f303535f8b3ce050393e3eedfbfffd14ba Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Thu, 13 Feb 2020 07:51:34 -0700
Subject: [PATCH] warning fixes (#505)

* fix some qt deprecations and a warning.

* fix fixes.

* fix comment
---
 globalsat_sport.cc | 16 ++++++++++------
 gui/gmapdlg.cc     |  6 +++---
 mapsource.cc       |  2 +-
 waypt.cc           |  4 +---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/globalsat_sport.cc b/globalsat_sport.cc
index f4e1af339..c016b3977 100644
--- a/globalsat_sport.cc
+++ b/globalsat_sport.cc
@@ -529,9 +529,13 @@ track_read()
       if (!showlist) {
         route_head* trk = route_head_alloc();
 
-        QString str;
-        str.sprintf("%02d-%02d-%02d_%02d:%02d:%02d", header.dateStart.Year, header.dateStart.Month, header.dateStart.Day, header.timeStart.Hour, header.timeStart.Minute, header.timeStart.Second);
-        trk->rte_name = str;
+        trk->rte_name = QString::asprintf("%02d-%02d-%02d_%02d:%02d:%02d",
+                                          header.dateStart.Year,
+                                          header.dateStart.Month,
+                                          header.dateStart.Day,
+                                          header.timeStart.Hour,
+                                          header.timeStart.Minute,
+                                          header.timeStart.Second);
         trk->rte_desc = QString("GH625XT GPS tracklog data");
 
         track_add_head(trk);
@@ -547,7 +551,7 @@ track_read()
         uint8_t trackDeviceCommand;
         int track_length;
         uint8_t* track_payload = globalsat_read_package(&track_length, &trackDeviceCommand);
-        is_fatal(((track_length == 0) || (track_payload == nullptr)) , "track length is 0 bytes or payload nonexistent");
+        is_fatal(((track_length == 0) || (track_payload == nullptr)), "track length is 0 bytes or payload nonexistent");
         //      printf("Got track package!!! Train data\n");
 
         uint8_t* dbtrain = track_payload;
@@ -810,7 +814,7 @@ data_read()
 // This used the serial communication to the watch
 ff_vecs_t globalsat_sport_vecs = {
   ff_type_serial,			// type
-  {										// cap
+  {
     ff_cap_none,			// waypoints
     ff_cap_read,			// tracks
     ff_cap_none,			// routes
@@ -822,7 +826,7 @@ ff_vecs_t globalsat_sport_vecs = {
   data_read,					// read
   nullptr,						// write
   nullptr,						// exit
-  &globalsat_args,			// args
+  &globalsat_args,		// args
   CET_CHARSET_ASCII,	// encode
   0,									// fixed_encode
   NULL_POS_OPS,				// position_ops
diff --git a/gui/gmapdlg.cc b/gui/gmapdlg.cc
index 744c5fdb3..e03149c56 100644
--- a/gui/gmapdlg.cc
+++ b/gui/gmapdlg.cc
@@ -162,7 +162,7 @@ GMapDialog::GMapDialog(QWidget* parent, const QString& gpxFileName, QPlainTextEd
     wptItem_->appendRow(it);
     it->setCheckable(true);
     it->setCheckState(Qt::Checked);
-    it->setData(qVariantFromValue((void*)&wpt));
+    it->setData(QVariant::fromValue((void*)&wpt));
     appendWaypointInfo(it, wpt);
     wptList_ << it;
   }
@@ -177,7 +177,7 @@ GMapDialog::GMapDialog(QWidget* parent, const QString& gpxFileName, QPlainTextEd
     trkItem_->appendRow(it);
     it->setCheckable(true);
     it->setCheckState(Qt::Checked);
-    it->setData(qVariantFromValue((void*)&trk));
+    it->setData(QVariant::fromValue((void*)&trk));
     appendTrackInfo(it, trk);
     trkList_ << it;
   }
@@ -192,7 +192,7 @@ GMapDialog::GMapDialog(QWidget* parent, const QString& gpxFileName, QPlainTextEd
     rteItem_->appendRow(it);
     it->setCheckable(true);
     it->setCheckState(Qt::Checked);
-    it->setData(qVariantFromValue((void*)&rte));
+    it->setData(QVariant::fromValue((void*)&rte));
     appendRouteInfo(it, rte);
     rteList_ << it;
   }
diff --git a/mapsource.cc b/mapsource.cc
index 7ba2c283f..084b42778 100644
--- a/mapsource.cc
+++ b/mapsource.cc
@@ -1405,7 +1405,7 @@ mps_routedatapoint_w_wrapper(const Waypoint* rte)
  * MRCB
  */
 static void
-mps_routetrlr_w(gbfile* mps_file, int mps_ver, const route_head* rte)
+mps_routetrlr_w(gbfile* mps_file, int mps_ver, const route_head* /* rte */)
 {
   char		hdr[2];
   int			value = 0;
diff --git a/waypt.cc b/waypt.cc
index db9375385..65e9c0a93 100644
--- a/waypt.cc
+++ b/waypt.cc
@@ -632,9 +632,7 @@ WaypointList::waypt_add(Waypoint* wpt)
     } else if (!wpt->notes.isNull()) {
       wpt->shortname = wpt->notes;
     } else {
-      QString n;
-      n.sprintf("%03d", waypt_count());
-      wpt->shortname = QString("WPT%1").arg(n);
+      wpt->shortname = QString::asprintf("WPT%03d", waypt_count());
     }
   }
 
-- 
2.30.2